bitkeeper revision 1.1159.1.507 (41d2c267giyCo6LZ_--l9fFOwkMRIQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 14:42:47 +0000 (14:42 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 14:42:47 +0000 (14:42 +0000)
commitb0d400dfba2b8517f00434a9c15826dac6327673
tree65870768809147a7c994a5f3cca9637aa01b51a8
parente1db94cbd17a13affef1ee9aa0bd0ded4a80c005
parent0fcafc5fdbdb5579accee3e9e12df3297e5db035
bitkeeper revision 1.1159.1.507 (41d2c267giyCo6LZ_--l9fFOwkMRIQ)

manual merge
12 files changed:
.rootkeys
xen/Makefile
xen/arch/x86/domain.c
xen/arch/x86/io_apic.c
xen/arch/x86/setup.c
xen/arch/x86/traps.c
xen/arch/x86/x86_32/entry.S
xen/common/kernel.c
xen/common/page_alloc.c
xen/common/physdev.c
xen/common/schedule.c
xen/drivers/char/console.c